merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 28 Aug 2012 13:44:20 +0000 (22:44 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 28 Aug 2012 13:44:20 +0000 (22:44 +0900)
commit12d3d4b1b2104a925f5310fffe823fa4d1f81a74
tree90da0d0dcd77b5886ef1d1e6725f1382afa25b89
parent7eff996fdd61e03fc9d339944da6397fcb4eee32
parente3f8c470d4c42665233b1f701ac6f61d83ecb4d7
merge trunk